From: Øyvind Kolås <pippin@gimp.org>
Date: Mon, 3 Dec 2018 23:18:47 +0000 (+0100)
Subject: cairo: make mapping of cmyk subset easier
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~12^2~20
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4886579cc813c56ab2b3426ba0ed42e9d331da15;p=babl.git

cairo: make mapping of cmyk subset easier

Make the mapping be RGB = CMK  and RGB = CYK, only magenta and yellow
vary between them and the order remains the same, making it easier to
spot inconsitencies in code.
---

diff --git a/extensions/cairo.c b/extensions/cairo.c
index e10f384..bca8bf4 100644
--- a/extensions/cairo.c
+++ b/extensions/cairo.c
@@ -545,11 +545,11 @@ init (void)
                      babl_component ("ca"),
                      babl_component ("A"),
                      NULL);
-    babl_format_new ("name", "cairo-ACKY32",
+    babl_format_new ("name", "cairo-ACYK32",
                      babl_model ("camayakaA"),
                      babl_type ("u8"),
-                     babl_component ("ya"),
                      babl_component ("ka"),
+                     babl_component ("ya"),
                      babl_component ("ca"),
                      babl_component ("A"),
                      NULL);
@@ -564,24 +564,24 @@ init (void)
                      babl_component ("ma"),
                      babl_component ("ka"),
                      NULL);
-    babl_format_new ("name", "cairo-ACKY32",
+    babl_format_new ("name", "cairo-ACYK32",
                      babl_model ("camayakaA"),
                      babl_type ("u8"),
                      babl_component ("A"),
                      babl_component ("ca"),
-                     babl_component ("ka"),
                      babl_component ("ya"),
+                     babl_component ("ka"),
                      NULL);
   }
 
   /* companion subset formats for setting pango u16 RGB color values from cmykA
    * */
-  babl_format_new ("name", "ckyA u16",
+  babl_format_new ("name", "cykA u16",
                    babl_model ("cmykA"),
                    babl_type ("u16"),
                    babl_component ("cyan"),
-                   babl_component ("key"),
                    babl_component ("yellow"),
+                   babl_component ("key"),
                    babl_component ("A"),
                    NULL);
   babl_format_new ("name", "cmkA u16",